From aad92ca58eec1316a794eb2019897d84188a27a5 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 20 Sep 2018 22:43:47 +0100 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 459241 -> 459529 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 1fa27229e85..15598349bea 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -291,6 +291,7 @@ export JAVAFLAGS=@JAVAFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ export JAVA_TARGET_VER=@JAVA_TARGET_VER@ diff --git a/configure.ac b/configure.ac index 4f3f49cf031322873b54c0a9b1ed5ec08a3df87e..4b787d12fbd165b9ae498379a45dd3bc6a2fe24d 100644 GIT binary patch delta 217 zcmaFaEYsO0)6l}$!nB3Ce8cpOKbX}FRJW&vW>?aiCm G+5!MFWEC?2 diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 363a8a41dea..bd05d4bba20 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -62,10 +62,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2